Pause on objective completion #2096
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
For reference, this is how I debugged this with an output to file that showed the state of the objective display queue: Show patch and debug output--- b/src/swarm-engine/Swarm/Game/Step.hs
+++ a/src/swarm-engine/Swarm/Game/Step.hs
@@ -341,9 +341,22 @@ hypotheticalWinCheck em g ws oc = do
_ -> return ()
queue <- messageInfo . announcementQueue Swarm.Util.<%= (>< Seq.fromList (map ObjectiveCompleted $ completionAnnouncementQueue finalAccumulator))
- shouldPause <- use $ temporal . pauseOnCompletion
- when (newWinState /= Ongoing || (notNull queue && shouldPause == PauseOnAnyObjective)) $
+ shouldPause <- use $ temporal . pauseOnCompletion
+ let willPause = newWinState /= Ongoing || (notNull queue && shouldPause == PauseOnAnyObjective)
+ -- TODO: remove this debug ouput
+ sendIO $
+ appendFile "log_win.txt" $
+ intercalate
+ " \t"
+ [ show $ getTickNumber ts
+ , if newWinState == Ongoing then "ongoing" else "won"
+ , if notNull queue then "queued" else "empty"
+ , show shouldPause
+ , if willPause then "AutoPause" else "Running"
+ ] <> "\n"
+
+ when willPause $
temporal . runStatus .= AutoPause
mapM_ handleException $ exceptions finalAccumulator |
xsebek
force-pushed
the
pause-on-objective
branch
from
bc6e804
to
43c9879
Compare
byorgey
approved these changes
Sep 8, 2024
src/swarm-engine/Swarm/Game/Step.hs
Outdated
| queue <- messageInfo . announcementQueue Swarm.Util.<%= (>< Seq.fromList (map ObjectiveCompleted $ completionAnnouncementQueue finalAccumulator)) | ||
| shouldPause <- use $ temporal . pauseOnCompletion | ||
|
|
||
| when (newWinState /= Ongoing || (notNull queue && shouldPause == PauseOnAnyObjective)) $ |
There was a problem hiding this comment.
I'm trying to make sure I understand the logic here. What is the purpose of the notNull queue check? How does the newWinState check and the other check fit together? (And can you turn your answer into some comments in the code here?)
There was a problem hiding this comment.
I named the parts using let. Is it clearer now? 🙂
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
--hide-goal Do not show goal modal window that pauses the game.--hide-goal--autoplay--autoplay --hide-goalautoplay_goals